Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Tue, 28 Jun 2016 19:59:05 +0000 (15:59 -0400)
committerTom Rini <[email protected]>
Tue, 28 Jun 2016 19:59:05 +0000 (15:59 -0400)

Trivial merge